Fix feature 1a
Fix feature 1b
Merge branch 'release/0.0.1' into develop