Update Client.java
Merge pull request #9 from kminhc/FelixChristianBranch

Update Client.java
Merge pull request #10 from kminhc/master

TobiasBranch merge from master