Work for issue 17
Merge pull request #20 from brendanbates89/issue-17-work

Closes issue #17.