Update Makefile
Merge branch 'kana' into hvkna

Update Makefile