merge with blin changes
merge w/ blin, split off hmmparse