Phase 2
Merge branch 'master' of https://github.com/karthik-chandrasekar/MWDB-AAAGK