Merge pull request #61 from conorfennell/master

Better populating
Update tag schema
Merge pull request #62 from jgho/updateTagSchema

Update tag schema
Change from tag id to tag