Merge pull request #137 from fabienrohrer/master

Refactored Makefiles
Merge pull request #138 from fabienrohrer/master

Fixed indentation