Merge pull request #4 from pstephen43/master

Sync up during 11/21 session
Merge pull request #70 from K-McK/master

Sync up before 11/23 session
Merge pull request #5 from pstephen43/master

Sync up before 11/23 session
Fixed mapping and some other error
Merge pull request #71 from PJTNT11/master

Sync up during 11/23 session
Merge pull request #5 from pstephen43/master

Sync up during 11/23 session