added tags support
Merge pull request #6 from odedshr/v0.6-tags

added tags support