fixes
Merge branch 'harentius'