Initial commit.
Added documentation.
Added documentation.
Conflict resolve.