merge in changes from master

pull master changes