Fix performance issues in Client
Update gitignore
Merge remote-tracking branch 'origin/master'