fixes
Merge pull request #677 from Tendrid/develop

fixes