Cleaned up
Merge branch 'newbranch'