Merge branch 'simplified'
Merge branch 'master' of https://github.com/vdveen/gittest