Sync with commit bcd3699 + improve Makefile