Merge pull request #15 from reekoheek/master

Merge from reekoheek/norm