Merge pull request #91 from gedare/cbufp

cbufp and cstub refactor