pull request 

update by Matt/Adam