a few fixes to Tristram.js
Merge remote-tracking branch 'upstream/CORE15' into CORE15
Merge pull request #103 from cuss/CORE15

Core15