Merge pull request #2 from domeix/master

mit blubb
Bla
WTF
Merge pull request #7 from DomChey/master

WTF!!!