added names
Merge branch 'master' of http://github.com/cnberry/kernel_1