Added Shim to options
Merge branch 'master' into chrome
Fixed chrome message shim