State edits
Merge pull request #191 from PJTNT11/master

State edits