Another 2.1 prerelease. Addresses issue #44 and #36. Untested.
Merge branch 'master' of https://github.com/SirFaizdat/Prison.git