updated documentation
Merge branch 'dev'