Merge pull request #10 from 30x/XAPID-706

Xapid 706