BOOK-486 + improvements on the same topic
Merge pull request #346 from onepercentclub/feature/BOOK-486

BOOK-486 + improvements on the same topic