Removed global variables in command parsing
Merge branch 'devel'