update
Merge branch 'master' of https://github.com/xlking/merge_libs