Fixes #6
Merge pull request #7 from jchamberlain/master

Fix for Issue #6