Merge pull request #1 from Netzone/Kevin

Kevin
hej
Merge pull request #2 from Denaton/master

hej
db