fixed issue #59
Merge pull request #140 from glomium/master

fixed issue #59