Update bugfix saving torches
Merge remote-tracking branch 'origin/master' into Bas
Memory leak fixes
Bye Magic Numbers!

Small changes to get rid of magic numbers!