Merge branch 'master' into kumimoji

Add dependency

Conflicts:
	Makefile