Fix #147
Merge pull request #158 from mitfik/9cb099ddd5b8115f69dbbb4958f07ac3cc08e6c4

Fix #147