Merge pull request #7 from jamesrichardsonjr/master