Updated for the latest XD version
Merge pull request #2 from dturanski/master

Updated for the latest XD version