Merge changes from devel branch

Changes from devel branch could be safely merged into master, I think