merge with lukas
Merge branch 'master' of https://github.com/dorleosterode/gt-scaffold