made code more readable and better :-)
Merge pull request #4 from florianbachmann/master

made code more readable and better :-)