Merge pull request #48 from pstephen43/master

sync up
Merge pull request #49 from pstephen43/master

sync up
Fixed merge errors
Merge pull request #50 from pstephen43/master

changes
ADDED DOXIGEN STUFF
Merge pull request #218 from PJTNT11/master

Small stuff