CommandHandler fix
Merge pull request #35 from Miliooo/loop

CommandHandler avoid endless loop