fixes quotes and file names bugs
Merge branch 'develop'