Fix file formatting which broke in merge
Update changelog
Merge branch 'hotfix_1.0.1'

 the commit.