Merge pull request #23 from 30x/XAPID-941

Xapid 941