Merge branch 'master' into develop
fixes #6
Version bump to 0.2.5
build commit
Merge branch 'release-0.2.5'