holy moses
Works with upstream/master
Merge pull request #8 from zachriggle/holy-moses

Holy moses