updated documentation from latest master