minor changes
merge with devel