Merge pull request #2 from jerturowetz/master

Get all the good stuff!