Fix of some bugs
Merge branch 'master' of https://github.com/DanielKeogh/SettingThingsOnFire

Merging changes