Merged changes from Xperience1080
Added extra fields to the addon.xml