Second pass: to be finalized
First pass: comments added
Merge branch 'master' of https://github.com/livesandletters/aor