Merge pull request #3 from guyrt/master

Benjamin Mako Hill || Want to submit a patch?