Added ProjectID
Merge branch 'master' of https://github.com/jogug/AuToCa
Refactoring, overall improvement