WBL: Initial commit with files received from Christophe