fix main.js to correctly return the kernel
Merge remote-tracking branch 'origin/master'