Merge pull request #11 from NathanKell/master

Ketchup.
JP
Merge branch 'master' into launch-sites
typo, order.
Merge pull request #18 from eggrobin/launch-sites

Launch sites