Fix for shr77.com

Fix for shr77.com changes
Merge pull request #406 from devnoname120/shr77.com

Fix for shr77.com

Closes #368, #400.
Merge branch 'master' into develop