long comment
Merge branch 'master' of https://github.com/kolmar1991/tutorial