Glorious I tell you.
Merge pull request #1 from hedenberg/master

Glorious I tell you.