integrate Mayday (mostly for fun, cleanliness and ease of addressing more work)
Merge pull request #2 from cjrieck/feature/cjrieck/mayday

Mayday integration
fix merge conflict