Potential fix for #80.
Merge pull request #81 from shadowjay1/master

Potential fix for #80.