updating to the devel branch