Pull request for mbishop's latest changes