Merge pull request #12 from 30x/XAPID-707

Xapid 707