Merge pull request #2 from makoshark/master

Benjamin Mako Hill || Want to submit a patch?