Added more diagnostics and improved tests for YAML
Improved command help
Merge remote-tracking branch 'upstream/master'