Backport pull request #110, update version number
Backport pull request #110, update version number
Merge branch '1.x' into gh-pages