modified from sts.
Merge pull request #15 from terasolunaorg/issues/2

modified from sts.