Finished proof-reading the documentation
Last changes to documentation
Merged with master
Finished writing tests