Commit15072014a

Client changes commit2