Fix for #12
Merge pull request #13 from ianwalter/master

Fix for Issue #12