Added protocol opt
Merge branch 'ian' of https://github.com/ianlee/hiddendragon into ian