pirate Merge pull request #231 from Ben-Atherton/master