update to 1.5.4
Merge pull request #229 from reallyenglish/tomoyukis

update to 1.5.4
Merge pull request #230 from reallyenglish/mitsuruy

update SUBDIRs in */Makefile