Merge branch 'master' of entidi.com:adg