Autumn cleaning of Makefile
Merge pull request #2 from andreastt/ato/makefile_autumn_cleaning

Autumn cleaning of Makefile