Minor API changes
Fail the future in case of error
Merge pull request #58 from wajam/jerome-skb-56-client

Minor API changes