fix error during merge
Merge pull request #77 from loki36/dev

fix error during merge