Merge branch 'master' into develop
Updated documentation (and comments in Test.cs)
Merge branch 'develop'