modernize
Merge pull request #1 from zendesk/grosser/modernize

modernize