added debug mode
Merge branch 'debug-mode' into develop