Search libraries for assets
Merge pull request #505 from holmes/master

Search libraries for assets