Fix
Merge pull request #2 from leach/master

Fix