Changed path for library file search
Merge origin/master