Merge pull request #1 from serbanu/master

Smth 5:06
finally
Merge pull request #3 from catalincatana/master

finally