Some merging of Methods
IF the other way :)
Merge pull request #43 from Flozi95/website

Website