fix issue #136
Merge pull request #142 from ingmargoudt/master

fix issue #136