Add Shuttle
Merge pull request #9 from square/tim/shuttle

Add Shuttle