Merge pull request #1 from kykyxDD/master