Makefile update
Merge branch 'master' of https://github.com/yhmtmt/aws
f_com update
Merge branch 'master' of https://github.com/yhmtmt/aws

Conflicts:
	filter/f_com.cpp