Minor Refactoring
Merge pull request #4 from DaveM214/master

Minor Refactoring
Merge pull request #1 from CookieH/master

merge