update for shannon fixes
Merge pull request #829 from Tendrid/develop

update for shannon fixes