Classifier added by fkunneman
Some housekeeping