Merge pull request #44 from terasolunaorg/issues/10

OK.
Please backport to 1.0.x branch.
Merge pull request #47 from terasolunaorg/issues/10

Merge pull request #44 from terasolunaorg/issues/10