0.4 push
Updated for 0.4
Updated for 0.4
Fixes from 0.41 and 0.42
Updated for 0.42