added yosemite, computed fit
merge