Change normalize, fix bugs.
Merge branch 'master' of github.com:roed314/OMS