merged classifiers, added new ones, add license