Fixed issue #36
Merge pull request #37 from willynilly/issue_36

Fixed issue #36