Updated changes and bumped version
Merge branch 'release/0.0.1c4' into develop