Remove drawproblem
Merge origin/master