Fix incorrect extraneous quoting (issues #34 and #37)
Merge remote-tracking branch 'leonardvandriel/master'

* leonardvandriel/master:
  Fix incorrect extraneous quoting (issues #34 and #37)