improved fix for issues with Chrome
Merge remote-tracking branch 'gargoyle/master'