Merge pull request #11 from tsandras/tristan2

Last commit