merge from tad0616:master