Fix cpu hog issue
Merge branch 'master' of https://github.com/cdesjardins/ComBomb