Convert values to str() where appropriate
Merge branch 'issue-32'

* issue-32:
  Convert values to str() where appropriate