Merge pull request #22 from 30x/XAPID-717

Xapid-717