Merge branch 'release/0.1' into develop
refractored and cleaned up
Merge branch 'release/0.2'