Slightly better Makefile for compiling

Also fixes #10