Fix issue #20
Merge branch 'issue_20' into issue_21
Fix Issue #21
Merge pull request #24 from willynilly/issue_21

Fix Issue #21