Merge pull request #4 from Bekjarce/master