Updage bookshelf to 1.1.3

From 0.2.8
Merge branch 'mm/update-bookshelf'