Update documentation
Merge pull request #165 from jehope/development

Update documentation