Typos.
Typos.
Merge https://gist.github.com/d504ce067b99686e4ae8
Merge https://gist.github.com/334b658cc8b3f6864c23