Merge and update for XE17
Merge pull request #1 from justinribeiro/update-for-xe17

Merge and update for XE17