General Update
Merge pull request #2 from FabianOvrWrt/master

General Update