Bug in the ghost's prison  has been fixed
Merge origin/master