Added Tag Bookmarking
Merge commit 'd1640ff3b0e32528eefc77579137812b296e1028'