Reduced Makefile complexity
Merge remote-tracking branch 'upstream/master'
Merge pull request #183 from fabienrohrer/master

Reduced Makefile complexity