Merge pull request #1199 from kooiot/master