Fix ordering
Use add function variable in tests
Rename on to by
Merge branch 'master' into gh-pages
Update docs