WIP
Merge pull request #16 from twokul/artists

WIP