Including changes from fgg89

We have included the improvements of fgg89: https://github.com/fgg89/odin-agent

and also some functions added for managing channels: 44b67e9