[sailfish] unify covers code
Merge pull request #96 from michael-k/covers

[sailfish] unify covers code