Fixed make file and made slight changes to Common.hpp