Merge pull request #10 from binaryking/master

Fix test build and merge conflicts
Merge pull request #11 from binaryking/master

MIFOSX-1723 Extend client service to handle images