Dev branch
Improved circle drawing
Merge branch 'dev'