Merge pull request #11 from GarethIW/master

Gredgie sync
Parachute

Am I happy with it? Sort of, yeah.
Merge pull request #12 from GarethIW/gredgie

Gredgie