Added myself to the list
Merge pull request #16 from zlatkoc/zlatkoc/first_task

Added myself to the list
Merge pull request #1 from evildmp/master

Merging upstream changes