Merge pull request #4 from Studio51/develop

Tag + bookmarks
Merge pull request #5 from Studio51/feature/tags

Merge pull request #4 from Studio51/develop