Added line 4
Merge pull request #1 from Olice/master

Added line 4
Added line 6
Merge pull request #2 from Olice/client

Client