Makefile updated
Merge branch 'common'