Merge pull request #65 from cezarsa/tags

Add back support for tags in resources