Problem: client needs to be parameterizable
Merge pull request #17 from lucteo/master

Problem: client needs to be parameterizable