Merge pull request #1 from Bekjarce/master

Merge