jflinter/Dwifft 1 merged

• Small fixes Dec 11