Merge pull request #4 from alex-filat/master

take from master
Merge pull request #7 from delfweb/master

Merge pull request #4 from alex-filat/master