Solution for #122. Works with save games
Merge branch 'master' into knusbaum-lives