Merge pull request #1 from makoshark/master.

Benjamin Mako Hill || Want to submit a patch?