Merge pull request #1 from wooice/master

Merge back code
Tag Service
Merge pull request #12 from dugu108/staging

Add tag service