Closes #45: Fixes final problems of b4dc354a
Closes #45: Fixes final problems of b4dc354a

getbookshelf/bookshelf-server,getbookshelf/bookshelf-server,getbookshelf/bookshelf-server,getbookshelf/bookshelf-server