Debugger removed
merge master