Pull in latest from master
Update docs