Update code to match current master
Update README