Merge pull request #247 from penguinho/master

0.18.1