Merge pull request #31 from penguinho/master

0.12.2
Merge pull request #32 from penguinho/master

0.12.3