Debugged merge with master