Merge pull request #122 from bastih/master

Improve Makefiles, allow for subdirectories in bins/libs