fix in project info
Merge branch 'master' into feature/15