Fix issue #50
Merge pull request #51 from noahlz/master

Fix issue #50