Merge pull request #197 from Lertsenem/pr-modernquotes