CommandParser 1.0.16 - work in progress