fix issue #151
Merge branch '#151' of https://github.com/adriano-di-giovanni/bookshelf into #151