fix #124
Merge pull request #125 from mauhiz/develop

fix #124