Merge pull request #2 from Striptik/master

1st pull request