Allow for '-' in service name ( Issue #12)