Merge pull request #152 from WoltLab/tutorial4