fixing issue #111
Merge pull request #113 from yoavgurevich/issue111

Issue #111 fixed