Fixed Issue #48
Merge pull request #49 from JeromeDane/master

Fixed Issue #48