add feature for issue #2