Points as canvas object (arc), better calculating position for objects
Merge branch 'master' into gh-pages