Updated resource location.
merge master.