Attempt fix for #77. Add support for # 'protocol'.