Some fixes
Merged with master branch
Merge pull request #170 from Coenego/libraries-fix

Some fixes