Merge pull request #18 from 30x/XAPID-1088

[XAPID-1088] fix resource leak, address comments