Merge pull request #6 from nistormihai/devel

Devel