update Master 2-19-13

update from master