Merge pull request #19 from alexandru-iacob/master

Done.
Merge pull request #20 from alexandru-iacob/devel

Merge pull request #19 from alexandru-iacob/master