Fix #54.
Merge pull request #55 from shadowjay1/master

Fix #54.