have a more generalized handling of libraries
Merge branch 'master' of https://github.com/DerOrfa/isis