Merge pull request #8 from monttj/master

merge test