Added arguments to Classifiers, resolve #8
Complete merge