fixes #225
Merge pull request #248 from betesh/master

fixes #225