Merge pull request #14 from pstephen43/master

sync up during 12/4 session
Merge pull request #15 from pstephen43/master

sync up during 12/4 session
FIXES
FIXES
Merge pull request #104 from PJTNT11/master

Sync up before 12/5 session