Merge pull request #34 from alexandru-iacob/master