Simplify client generation
Merge pull request #48 from CatTail/master

Simplify client generation