Merge pull request #2 from framgia/update1510

Update
Task1 - sjfhalsjdflkajhdf
Merge pull request #3 from bs90/task1

Task1
Task2