Merge pull request #47 from eggrobin/master

Ketchup.
Fixed small caps.
Merge pull request #48 from eggrobin/the-great-branch-of-small-fixes

The great branch of small fixes