Fixed issue #23
Merge pull request #24 from emersonveenstra/issue-23

Fixed issue #23