Add support for TimeLox gateways on master branch