Merge pull request #8 from nathanpaul/hackathon

Hackathon
Merge pull request #9 from JamesRottinger/hackathon

Hackathon