Merge pull request #54 from pstephen43/sr_dev

sync up
changes unknown
Merge pull request #227 from PJTNT11/sr_dev

code clean up