Bookmarks only created once
Merge pull request #22 from cabe56/fernando-fixes

Bookmarks only created once