this commit fixes #135
Merge pull request #160 from kinsamanka/fix_#135

this commit fixes #135