Fixed bugs
Merge branch 'release/0.0.1' into develop