updates
Merge pull request #718 from Tendrid/develop

updates