Merge pull request #12 from 30x/xapid-630

Xapid 630