Merge pull request #31 from pstephen43/master

sync up
added more doxigen stuff
Merge pull request #185 from PJTNT11/master

sync up