updated lib
Merge branch 'dev'