jquast Merge pull request #296 from billsimon/patch-1 …