Improve Command
and Command not run
events
#308
Merged
Command
and Command not run
events
#308