updated from master: