add support for different protocols
some missing newlines added
Merge branch 'protocol_support'