Merge pull request #42 from 30x/XAPID-862

XAPID-862: make sure we log things properly