refs #235
Merge branch 'master' of github.com:Chill-project/Documentation