add minor changes concatSubs in cpp, makefile update.