Add Makefile and fix dockerfile