Merge pull request #506 from andrewcsmith/patch-2