Improve debug information
Merge pull request #84 from linqcan/dev

Improve debug information