pull new resource

sync with master