Merge pull request #1 from OpenELEC/master

merge with OpenELEC