Merge pull request sync with library update #2