fixed results of merge
Merge branch 'develop' into feature/modifiedRake
Slight change to documentation.
Slight change to documentation.