Merge upstream changes

Merging Xentool URL changes into my fork