Merge from 0.4.8

Source comes from Chrome extension as it's still in 0.4.7 on GitHub.