merge bookvika-enhancement /  master