Merge pull request #17 from dmend/master

Client refactor for M3