Merge pull request #1232 from kooiot/master