Fix issue #35
Merge pull request #36 from willynilly/issue_35

Fix issue #35