Merge pull request #2 from Cbsoftware/debug-mode

Debug mode
Merge remote-tracking branch 'remotes/origin/master' into debug-mode