Incorporate danman01's work into donnoman:master