update features to issue #25.