Merge pull request #1 from cjsmith1/master

merge new changes