yuri Merge pull request #3 from Greezlee/master