Issue 16 into master

Now the walls are not on fire after the explosion