Merge branch 'master' of https://github.com/benbalter/g-man
Merge branch 'master' of https://github.com/benbalter/g-man