Merge pull request #698 from cshore/pull-request-fix-lib-depends