Improve Makefiles / close #34