version bump
Merge branch 'master' into gh-pages
version 1.0.7