Fix issue #4
Merge pull request #5 from willynilly/issue_4

Fix issue #4