First pass: TO BE CHECKED
Merge branch 'master' of https://github.com/JaapGeraerts/aor