add tag support resolves #8