add feature for #3