Merge pull request #2 from joshjcarrier/master

Moar 90s.