Devel

merge from devel branch