draw problem is a class
Merge origin/master