Merged my changes and modified Makifle to compile