Pushed to 0.4.0 develop