readme and changes
Merge branch 'develop' into release/0.1.2
Merge branch 'release/0.1.2' into develop