fix #22
Merge branch '1.2.2' into gh-pages