Merge pull request #30 from alexandru-iacob/master

Merge to DEVEL