commit from Makefile 20131115.1623
commit from Makefile 20131116.2355