merge updates from master
more docs