vyazadji: for conflict 3
Merge pull request #3 from vyazadji/master

Pull request from vyazadji: for conflict 3