almost finish
Merge pull request #1 from techlogics/Fix-Tag

almost finish