Merge pull request #2 from Striptik/master

1st pull request
Merge pull request #3 from Striptik/first-branc

Merge pull request #2 from Striptik/master