MIFOSX-1722 Extend client service to handle identifiers
Fix failing test build
Fix merge conflicts
Merge pull request #10 from binaryking/master

Fix test build and merge conflicts