Fixes Issue #4
Merge pull request #5 from ohnnyj/issue-4

Fixes Issue #4