Add feature for issue #1.