Fixed typo in title
Added initial tagging support