#516- Updated documentation.
#516- Updated the implementation.