Fixes #7 and #10
Bumps version
Merges with develop