Merge pull request #185 from PJTNT11/master

sync up
Merge pull request #191 from PJTNT11/master

State edits
compile issue
Merge pull request #51 from pstephen43/sr_dev

Sr dev