derp
Merge pull request #1 from rossdeane/hawking

derp