Reverted back to 0.4.0
Bump version
Merge develop