0.13.0
Merge pull request #33 from penguinho/master

0.13.0