with comments from AT
Merge branch 'master' of https://github.com/61bproject/pj3