Fix #148
Merge pull request #149 from komex/develop

Fix #148