Merge pull request #1 from kykyxDD/master

task1a
Merge pull request #2 from hohliksmile/master

Merge pull request #1 from kykyxDD/master