ticket: 8 Tag implemented
Merge branch 't8_tag'

ticket: 8 merged to master