Changed string to QString
Merging changes that carl made