Merge pull request #97 from murrekatt/develop

Rename api to client.