final minor changes
Merge pull request #6 from Slurps/master

Merge pull request #3 from arvala/master
Merge pull request #4 from arvala/master

asd