Merge pull request #4 from Studio51/develop

Tag + bookmarks