Try using strtok to parse command
Merge branch 'develop' into colors