MIFOSX-1722 Extend client service to handle identifiers
Merge pull request #9 from binaryking/master

MIFOSX-1722 Extend client service to handle identifiers
Fix failing test build
Fix merge conflicts