Merge pull request #1127 from afs/xloader

Xloader (more)