XE6 Support
Merge pull request #29 from rlove/features/xe6

XE6 Support