Fixed a bug from 59935b470674ae26342fd4145f9cba85a1cd9443

Cmd() now checks if length of token we're looking for is equal to token we've found
Merge branch 'dev' into dev-console
Removed some unused objects