Added the command feature
Minor bugfix