#566 updates to wiki
Merge pull request #567 from joola/feature/#566

#566 updates to wiki