Apply cicm wrapper optimizations
Merge branch 'master' of https://github.com/CICM/HoaLibrary