trevor landau's proposal
Merge pull request #10 from landau/master

Let's get functional