Updated library files.
Merge branch 'develop'