triscia fixes
Merge pull request #309 from arnaudbey/trisciaFixes

triscia fixes