extend Draw function
Merge branch 'master' into iznabarrage
fix the bug which disturbs compiling
Merge branch 'master' into iznabarrage
merge sample 'b3' to 'b2'
set origin