add more codes for cdi
Merge branch 'master' of https://github.com/gretawang/cdi