Merge pull request #16 from pstephen43/master

sync up
sent back
newest 1
Merge pull request #181 from K-McK/master

sync up