Merge pull request #7 from bsmith95610/master

merge