Add positioning for rectangle
Update tests
Merge branch 'master' into gh-pages
u