Add some documentation.
Merge branch 'master' into dispose
Fix one test.