Fix #142
Merge pull request #157 from penguinho/master

Fix #142