Merge in client library.
Merge pull request #8 from SURFnet/maintenance/merge-in-client

Merge in client library