Fixed library
Merge with development