Dev update from jerrywang1981

Dev update from jerrywang1981