Merge pull request #29 from pstephen43/master

sync up during 2/16 session
Small changes
Merge pull request #171 from PJTNT11/master

sync up after 2/16 session