Update kernel.cpp
Update main.cpp
Update main.h
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/kernel.cpp