Fixed bug in client2 : commands with arguments would not work...
Merge remote-tracking branch 'origin/master'