tidying up loose ends
commting artist, search, main & test
Merge remote-tracking branch 'origin/master'
just cos