Merge branch 'release/0.1' into develop
updating readme
Fixed conflicts