Merge pull request #1 from yyttr3/master

pull6
Merge pull request #7 from swpatterson9454/master

pull9