Version bump.
Merge branch 'develop'. This fixes #2.