Merge pull request #22 from tmatthews0020/master

merge