Merge pull request #1 from Dmitry404/master

week1 pull request
week1 Alexey Todorov
Merge pull request #18 from alextod/master

Alexey Todorov - week1 has been done