Feature enhancements. Contributors: Ken Dickey and Bernhard Pieber