Edited controller to adjust with new command methods
Merge branch 'master' into parser/Victor