Fix bugs
Merge branch 'master' of https://github.com/cyberbeer/Spread-of-Fire

Fix bugs