Properly fixed #47

Sorry for the double PR.
Merge pull request #58 from bearbin/patch-1

Properly fixed #47