Bump the project version
Bump the short version string
Merge pull request #24 from robrix/1.2

1.2