canonicalised - part 3
Merge branch 'master' of github.com:asad/AAMTool