Fixed bugs with makefile and merging of modules