Updated documentation to match branch (beta 4)