Merge branch 'library_2' to 'master'