#125 wiki update
#125 cleanup
Merge branch 'develop'