Merge pull request #4 from arvala/master

asd
Merge pull request #7 from Slurps/master

Merge pull request #4 from arvala/master