Merge branch 'XMLFree' of github.com:tonyfyt/bookshelf into XMLFree
Merge branch 'XMLFree' of github.com:tonyfyt/bookshelf into XMLFree