Merge branch 'release/0.2.4' into develop
Merge branch 'master' into develop
Bump version 0.2.5
Merge branch 'release/0.2.5'