Bugfixes for the client.
Merge pull request #17 from salithus/develop

Bugfixes for the client.