first update
Merge pull request #1 from kevinkrenz/master

first update