merged ze fix and cap fix
pasodfsa
Q2 Merged cap fix
Merge branch 'TREX'

Conflicts:
	example-quote.txt
	quote2.txt
merged