better
Merge branch 'master' into git-refactor
Merge pull request #1 from ddevlam/git-refactor

Git refactor