Merge pull request #500 from andrewcsmith/patch-1