Bump version
Merge branch 'issue-3' into issue-4