Pull request from Spencer Quistberg