Merge branch 'master' of github.com:ntd/adg