Merge pull request #15 from 30x/XAPID-1088

Xapid 1088