Working on wiki documentation
Merge branch 'origin/develop'