Update project settings
Merge branch 'fix'