Merging with the master code of Nik.