Merge pull request #923 from hintjens/master

Revert "Fixed potential SEGFAULT."
added norm_engine
added norm_engine
Merge pull request #924 from bebopagogo/master

NORM protocol extension
Fixed comment