normaliser #1

Open
awe wants to merge 13 commits from normaliser into master
13 Commits