omniplex fixes
Merge remote-tracking branch 'origin/master' into task
better handling of comments and protocol names