[0.1.1] to [0.1.2]
Merge branch 'master' of https://github.com/tolitius/cccp