Fix issue #21
Merge pull request #24 from fsquillace/issue_21

Fix issue #21