Merge pull request #21 from alexandru-iacob/master

pul into devel