0.12.0
Merge pull request #26 from penguinho/master

0.12.0