Hackathoned
Merge pull request #5 from gpfeff/hackathon-rush

Hackathoned