carriage returns deleted and addon.xml amended