full multi-line support
more comments
Merge branch 'command_enhancements'