Merge pull request #23 and bump version
Merge remote-tracking branch 'origin/master'