Version 0.4 (round 2)

Upgrading ProMotion to version 0.4.0. Reset master due to premature merge.