Merge pull request #22 from iotbzh/tobias-dev