Documentation update
Merge pull request #374 from Eighke/development

Documentation update