Feature/quote

please merge lukewaite branch