Merge pull request #30 from 30x/XAPID-867

Xapid 867