made work with joined table thingy
Merge remote-tracking branch 'origin/master'