Change quotation style
Move _with_name within do scope
Merge branch 'develop'