Jackson 1 & 2 with changes requested by Simone


detailed pull request comments sent by email to Simone Bordet.