Merge pull request #28 from daniellemayne/develop

bugz 5126: added os mapping to descriptive names
Merge pull request #30 from daniellemayne/develop

Develop: added null checks and bugfix 5175
Merge pull request #32 from daniellemayne/develop

reuse service instance where possible