Minor makefile cleanup; Set version as 1.0.4