relates to issue #19. changes for wiki.
Merge pull request #22 from joola/feature/3.4

leftover of 3.4 merge to develop