Updated with Books Should be Free
Merge branch 'master' of https://github.com/spoyser/XBMC