Merge pull request #94 from PJTNT11/master

cleaning up the merge
Merge pull request #11 from pstephen43/master

Merge pull request #94 from PJTNT11/master