Merge pull request #4 from alex-filat/master

take from master