Merge pull request #44 from g1smd/master

Manually re-added your changes.