Updated library files.
Merge branch 'develop'
Updated library files.