missing quotes
minor cleanup
Merge branch 'dev'