Merge pull request #30 from alexandru-iacob/master

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

Merge pull request #30 from alexandru-iacob/master