Merge branch 'release/0.5.1' into develop
fix example in README.md
Merge branch 'release/0.5.1'
Merge branch 'master' into travis-ci