Updated documentation
Merge pull request #381 from Eighke/development

Updated documentation