Katherine Employment Expansion
Katherine Employment Expansion
Merge pull request #593 from IndirectOne/master

Katherine Employment Expansion
Prisoner fixes done.
Merge remote-tracking branch 'upstream/master'