Refactoring
Merge branch 'otb-academy' of https://github.com/tomajaa/bookshelf into otb-academy