add extension & fix bug
merge master
recover extension