Working towards 1.1.1
Merge branch 'master' of git@github.com:SirFaizdat/Prison.git