Merge pull request #17 from luis-henrix/pr_hardcoded_lib_paths