0.18.0
Merge pull request #45 from penguinho/master

0.18.0