Fixed style
Fixed typos
Merge branch '1.1'