fix issue #12
Merge branch 'master' of github.com:jessepollak/gitgladiator