Added quote grabbing system
Merge remote-tracking branch 'lug/master'