Merge pull request #24 from ZomgPonies/master

Merge from Master
SyndiBomb Fix
Merge pull request #455 from Fox-McCloud/SyndiBomb-Fox

Syndi bomb fix