Minor stuff.
Merge https://github.com/thasenpusch/cappy
Minor stuff