Improve Makefile

Fixes #65