Updated documentation
Merge branch 'development'