Fixes for browser including
Merge branch 'develop' of github.com:ovcharik/teddy into develop