Merge pull request #1 from ben-zen/master

Benjamin Mako Hill || Want to submit a patch?