fixed issue #136
Merge pull request #379 from michaltakac/master

fixed issue #136 thanks to @ajgallego