Merge pull request #32 from alexandru-iacob/master

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

Merge to DEVEL