Drawing class updated
Merge branch 'xingyu' into Xiao