Client Server test, fixes #2
Fix to support java 6
Merge pull request #3 from johvik/issue2

Client Server test, fixes #2