Merge pull request #6 from uescher/master

formating the makefile