Fix issue #28
Merge pull request #32 from willynilly/issue_28

Fix issue #28