Bump version
Spacing
Replace chrome specific function with one that can be easily extended