merge feature/beer-index