Experimental: suggested API changes for discussion
Merge pull request #6 from ptaoussanis/client-api-fork

Experimental: suggested API changes for discussion