Start updating documentation.
Fixed newline.
Fixed newline.
Fixed newline.
Merge branch 'master' into update_doc

Conflicts:
	README.md
Merge pull request #47 from MarcCote/update_doc

Update doc