78e6f96 Integrated and improved feature computation code