Merge pull request #19 from pstephen43/master

sync up
all the clean up changes since state
Merge pull request #195 from K-McK/master

cleaning up the comments
merging code
Merge pull request #34 from pstephen43/master

sync up