Merge pull request #56 from pstephen43/sr_dev

sync up
more doxigen stuff
Merge pull request #230 from PJTNT11/sr_dev

sync up