Updated to conform XBMC rules