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

fixed XAPID-862, make sure we log things properly, format code