fixes #2: Improve service to meet latest service-commons changes
Merge 'develop' with 'issue-2' (#2)