Library path fixed
Merge origin/master