take over the changes for chrome
fix test
Merge pull request #189 from mimmi20/issue-105-chrome

take over the changes for chrome