Updated to close #8
Merge pull request #9 from mbjordan/master

Updated to close #8.