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

Xapid 1070