Upstream+browser

merged changes from pull request #77 into upstream.