Add basic debug
Merge branch 'debug'