fix bug with names with '
Merge branch 'matt_dev' into dev