Merge pull request #34 from alexandru-iacob/master

Merge to DEVEL
Merge pull request #35 from alexandru-iacob/devel

Merge pull request #34 from alexandru-iacob/master