fixes #10
version bump
Merge remote branch 'upstream/master'