Commit Colin McGlynn Pull Request #77 Shuttle-UM

Closes #77 Shuttle-UM