update todo
merge remote devel branch