Merge "Improve Makefile.py for zhtable"