Update with more comments, and bug fix
Merge branch 'master' of github.com:AlexSandilands/GraceDoc