add orc; adjust archer
Merge branch 'master' into gh-pages