Bug fix from development team [AS].

Depending on OS version - services sometimes prefixed with 0x.
Merge pull request #115 from RobbieDubya/master

Bug fix from development team [AS]