Merge pull request #3 from Bekjarce/master