Fix #41
Merge pull request #42 from shadowjay1/master

Fix #41