Devel

merging latest changes into master