Merge pull request #44 from terasolunaorg/issues/10

Merge to 1.0.x branch. #10