simplified a little, took a more principled approach to options
bump version numbers
Merge branch 'release/v0.1.4' into develop