Merge pull request #28 from alexandru-iacob/master

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

Merge pull request #28 from alexandru-iacob/master