added debug info
Merge branch 'debug'