Upgrade to Ror4

hi Phillippe, I have a created a new branch - 'ror4-2' with the cumulative changes from the previous PR (#9). You could pull these changes in without any merge conflicts.