Oxygene Compatible code branch

Hi Can you merge this with your repo?