Cleaned up headers
Updated project name
Merge branch 'master' into 2.0