added uncommitted norm_engine changes
Merge pull request #926 from bebopagogo/master

added uncommitted norm_engine changes