Devel

Merge issues fixed.