bug fix
Merge branch 'release/1.0.0' into develop
README again
Merge branch 'develop' into feature/something