add two other tags and remove unused code
Merge pull request #3 from mereskin/master

add two other tags and remove unused code