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

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

Minh-Branch merge from master