updated documentation
merged master version