fix issue #50
Merge pull request #51 from marknv/master

fix issue #50