- PLD merge, updated to 0.2.4