Add usage information and validate that all commands receive the correct
parameters to run
Merge with master