0.18.0
Merge pull request #242 from penguinho/master

0.18.0