Add tags

It closes #16