Merge pull request #1 from redbonesmith/master

merge