Merge pull request #28 from alexandru-iacob/master

Merge to DEVEL