ticket:8 Changed tag
ticket:8 Fixed tests
Merge branch 't8_tag'