Merges master and kpcc branch