Merge "Fixed the documentation and unit tests"