Updated project name
Merged dev branch into master