fixed #136
Merge pull request #137 from giastfader/master

fixed #136