rewrites a bit the documentation
Merge pull request #27 from folieadrien/fixes-rebasing-mistakes

rewrites a bit the documentation