Continuing work (why in stable?) on makefiles
Fixing merge problem