Solved conflicts
Merge pull request #5 from dragos-dumi/master

Solved conflicts