Bomb object and few other additions
Merge branch 'master' of https://github.com/SnowblindFatal/tim