Merge pull request #5 from serbanu/master

change
changes
Merge pull request #10 from catalincatana/master

changes