fix #128
Merge pull request #130 from terion-name/develop

fix #128