fixes #129
Merge pull request #130 from topcoat/issue_129

fixes #129