Pull request

Since I can't commit directly and Patrick isn't around.  Hopefully Jason can accept this...