Comments added in text, to be checked by JE
Merge branch 'master' of https://github.com/livesandletters/aor