Drawing working
Merge origin/master