Merge pull request #1 from JeroenVandezande/master

Oxygene Compatible code branch
compilation fixes after Oxygene merge
small fixes to get it compiling again in Oxygene