merge with upstream
fixed Makefile