Fix compilation using d2007
Fix DelphiXE compilation
Merge pull request #44 from alexeyvo/development

Fix project compilation