add trans rule in Makefile
Merge branch 'dev'