Fix issue #19
Merge pull request #20 from woozyking/master

Fix issue #19