Merge branch 'toys-arrow-improvements' into 'master'

Toys arrow improvements

Closes #20

See merge request !40