Add correct tag reset and tests
Merge pull request #19 from lexplua-y/master

Add correct tag reset and tests