Added support for bookmarks
merged conflicts