Elvain's tech changes
Elvain's tribal changes
Merge pull request #31 from bnormoyle/master

Elvain's tech changes