Merge branch 'harentius'
Refacoring