merging ignore changes to master, fixed mcg root dir bug