Merge pull request #1 from mockingbirdnest/master

Ketchup.
Merge remote-tracking branch 'ur/master'
Remove 'inline' from the header as it's redundant with the contents of the -body.hpp.
Merge pull request #22 from eggrobin/declutter-header

Declutter header