code improved issue/#25
Merge pull request #28 from lc-petranussdorfer/issue/#25

code improved issue/#25