Add makefile, fix bugs
Measuring time