import from coverart master branch