Update commands to be compatible with command blocks
Merge pull request #2165 from Snaipe/command

Update commands to be compatible with command blocks