Merge branch 'cv'
Merge branch 'master' of https://github.com/kenkam/kenkam.github.com