use tags
Merge pull request #3554 from vontio/master

use tags