chip fixes
fixed large OTCol
Merge remote-tracking branch 'origin/master' into gh-pages