Started working on library
Fixed library bug
Merge branches 'library' and 'master'
UI improvements