First pass, to be checked
Merge branch 'master' of https://github.com/livesandletters/aor
Second pass: for final consideration