Merge https://github.com/soniah/gitmagic