More and better documentation
Merge branch 'test'