Fixes issue #18.
Merge pull request #19 from brendanbates89/issue-18

Fixes issue #18.