Schweet new methods

I forgot, ok :|
Merge remote-tracking branch 'origin/master' into Database