Merge branch 'release/0.0.5' into develop
proper wiki links
Merge branch 'develop'

* develop:
  proper wiki links