Updated documentation.
prepared for tests
merged from master