Merge in service disable branch. Issue #11