Merge branch 'master' of github.com:skybee/house-control