Very simple implementation of cover browser
merge from upstream