Merge pull request #94 from PJTNT11/master

cleaning up the merge