Merge pull request #2 from MikiSoft/master

Task 1