Fixing merge
Merge branch 'newthing'