This branch improves the documentation as well as to some cleanups in the imports
merged
mentioned in commit 8857f211