Merge pull request #180 from penguinho/master

0.9.0