Merge pull request #49 from 30x/XAPID-994

Xapid 994