added main method
Merge pull request #1 from tsclhlimmer/master

Merge pull request #1 from Wartz/master
Merge pull request #2 from Wartz/master

gimmie2