Merge pull request #1 from jconkin/feature/Bookshelf

Feature/bookshelf
Merge pull request #2 from jconkin/develop

Develop