fixes #144
Merge pull request #148 from Project60/issue_144

fixed #144