Merge pull request #122 from thecodingmachine/reconnecting_scene