further clean command handler
Merge pull request #37 from yschaeff/commandhandler3

further clean command handler