modified issue #7
Merge pull request #19 from terasolunaorg/issues/7

modified issue #7