working on new documentation
Merge branch 'newdoc'