Merge pull request #737 from nistormihai/devel

Devel
Merge pull request #738 from nistormihai/devel

Devel