dankh

I have rebased the branch to master with quotes added.

Rebase removed, only my changes present in pull request.