Merge pull request #1 from openhab/master

sync