d
Merge pull request #18 from juliendebray/bookmarks-optimization

bookmarks opti
conflicts resolved