moved library
Merge branch 'dev'