forgot to add normalization to operations
Merge branch 'refs/heads/jan'