Merge branch 'release/0.2.5' into develop
README update
Merge branch 'develop'