Fixed library search path
Merge branch 'development'