Merge branch 'master' into develop
fixes #2
fixes #3
fixes #4
fixes #5
Version bump to 0.2.4
bump commit
build commit
Merge branch 'release-0.2.4'