Add support for tracking user and project
Merge remote-tracking branch 'origin/master'