fixed #227
Merge pull request #231 from giastfader/master

fixed #227