EHMMLabeller.java merged to master