Merge pull request #3 from jerturowetz/master

Get the good stuff