fixed stuff in branch 'one'
more fixing in branch 'one'
Merge branch 'one'