Merge pull request #698 from rbignon/fix-import-lib