update from master 2-26-13

update from master