add lib support
Merge branch