Revert "Revert "Merge pull request #1 from ajoshdee/issue#8""

This reverts commit 90c958ee900a8488494f71ce6d97d2e2192ce0b8.