Added some quotes.
merged changes.