Tags creator tools added, refactoring
Merge remote-tracking branch 'origin/master'