Delphi 7 Compatibility
Revert last commit because broken delphi 7 compatibility
Merge branch 'delphi7'