fixed error that generated bad classname (it included quotes)
18th connect style fixes
Merge remote-tracking branch 'upstream/master'