Fix in Project Class
Merge origin/master