Set project root
Merge commits from master