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

Master