add 'stat'
merge master