refactoring: merged now only one time with name of template, not with template class, version bump