Fixes #1
Merge branch '1.x'

* 1.x:
  Fixes #1