Merge pull request #388 from sergeyklay/master

Tag fixes