More cleanup
Minor makefile cleanup; Set version as 1.0.4
Merge branch '1.0.x'