v1.1.x: refactor
v1.1.x: refactor Makefile