updated documentation
Merge branch 'eric_working'