CommandParser 1.0.4 - work in progress