Zealot added and Make file changed to p6
Merge remote-tracking branch 'origin/master' into dev_zch