Allow adding mock client types
Merge pull request #2 from aragaer/master

Allow adding alternative client types