tests new dao methods
Merge remote-tracking branch 'origin/master'
one more stupid commit