Merge pull request #767 from nistormihai/devel

Devel
Merge pull request #768 from nistormihai/devel

Devel