Changes from Riccardo Novaglia for fixes
Additional files