update from dev100

update from dev100